Merge pull request #2 from steprescott/master

Bringing develop up to date with master.
Merge pull request #3 from steprescott/develop

Merge pull request #2 from steprescott/master