some minor changes
Merge pull request #1 from MichaelHilton/master

some minor changes