closes #92
Merge pull request #93 from ridoo/master

closes #92