this closes #60
Merge pull request #66 from eprogramming/master

this closes #60