closes #94
Merge pull request #95 from ridoo/master

closes #94