issue #16
Merge pull request #17 from eprogramming/master

issue #16