Merge pull request #1 from einhander/master