this closes #17
Merge pull request #18 from eprogramming/master

this closes #17