more things..
Merge pull request #14 from eprogramming/master

more things..