Updates Galore

There shan't be a description more beautiful
Because all the developers are very full
Merge pull request #1 from alexwpotter/master

Let's merge this F#!%cker