issue #49
Merge pull request #71 from eprogramming/master

issue #49