small improvements from Paul
Merge pull request #6 from pmur002/master

small improvements from Paul