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

issue #32