closes #55
Merge pull request #84 from ridoo/master

closes #55