issue #40
Merge pull request #41 from eprogramming/master

issue #40