Fixed, added and changed lots of stuff
Merge pull request #1 from chrene/master

Fixed, added and changed lots of stuff