Changed some goodies
Merge pull request #2 from irongeorge/master

Changed some goodies