small changes from Paul
Merge pull request #8 from pmur002/master

small changes from Paul