updates
Merge pull request #30 from eprogramming/master

updates