Minor tweaks
merge conflicts resolved
fixed merge conflicts
New fixes
Merge branch 'master' into alex
Freshen up styling
Merge pull request #13 from alexabbott/alex

Freshen up styling