issue #36
Merge pull request #37 from eprogramming/master

issue #36