massive makeover
Merge branch 'master' of https://github.com/Blue-Motion/Graphics
I have no idea anymore. Merge..?