Merge pull request #1 from core9/develop

Develop
Merge pull request #2 from core9/develop

Develop
Merge pull request #1 from jessec/develop

Develop