updates
Merge pull request #31 from eprogramming/master

updates