minor mods for testing
Merge pull request #6 from johntom/development

minor mods for testing