closes #26
Merge pull request #27 from ridoo/master

closes #26