More formatting
Merge pull request #200 from ronaldrager/master

More formatting