Issue #127
Merge pull request #159 from eprogramming/master

Issue #127