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

issue #16