Merge pull request #1 from Restless-ET/develop

Develop into Master
Merge pull request #2 from Restless-ET/develop

Develop into Master
Merge remote-tracking branch 'origin/develop'