Fixed Stuff
Merge pull request #1 from charpun/master

Fixed Stuff