Merge pull request #1 from crbrox/master

Sync master<->develop
Merge pull request #2 from crbrox/develop

Merge pull request #1 from crbrox/master