this closes #51
Merge pull request #65 from eprogramming/master

this closes #51