Merge pull request #90 from eprogramming/master

updates