Merge pull request #1 from seago/develop

Merge develop to master
Merge pull request #2 from seago/master

Merge pull request #1 from seago/develop