closes #39
Merge pull request #40 from ridoo/master

closes #39