this closes #14
Merge pull request #22 from eprogramming/master

this closes #14