Merge pull request #1 from crbrox/master

Sync master<->develop