Version 0.5
I suck at git
Merge