Old branch hanging around, gonna save it just in case.
Bam!
Bam bam!
Merge pull request #1 from rapzo/dev

Merge FTW