Prettifying
Minor refactoring
Merge pull request #1 from nwj/master

Fixing master/Master branch names...