updates
Merge pull request #19 from eprogramming/master

updates