Cleaning up
Merge branch 'master' of https://github.com/rt2520/Graphics