more changes
Merge pull request #2 from tommyjohnson/develop

more changes