this closes #8
Merge pull request #16 from eprogramming/master

this closes #8