Merge pull request #1 from seago/develop

Merge develop to master