this closes #44
Merge pull request #52 from eprogramming/master

this closes #44