some small changes
Merge pull request #1 from robrankin/develop

some small changes