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

this closes #52