I guess I will merge this with the main one.
Fixing stuff
Fixing a few more things.
Merged branches and resolved conflicts.
Fix fix fix
More fixing of the things.
Merge pull request #4 from Xfanger/master

Just some merge and branching fixes.