Merge pull request #2 from steprescott/master

Bringing develop up to date with master. I think.