closes #73
Merge pull request #74 from kelonye/master

closes #73