issue #77
Merge pull request #79 from eprogramming/master

issue #77