Merged #264 and upstream/develop.
Merge pull request #279 from B3nRa/issue#264

Merged #264 and upstream/develop.