issue #46
Merge pull request #63 from eprogramming/master

issue #46