issue #23
Merge pull request #34 from eprogramming/master

issue #23