more updates..
Merge pull request #25 from eprogramming/master

more updates..