My changes from seggs
Merge pull request #6 from seggs/master

My changes from seggs