Some minor fixes
Merge pull request #7 from Rob--W/master

Some corrections