Fix tab/spacing issues
Merge branch 'master' of https://github.com/jwei7er/graphics