Merge pull request #3 from einhander/master