closes #35
Merge pull request #36 from ridoo/master

closes #35