closes #80
Merge pull request #96 from ridoo/master

closes #80