Merge pull request #94 from eprogramming/master

issue 85