this closes #53
Merge pull request #70 from eprogramming/master

this closes #53