more new formatting!
Merge pull request #21 from Fitzoh/master

more new formatting!