Merge pull request #2 from einhander/master