closes #12
Merge pull request #13 from ridoo/master

closes #12