Merge pull request #11 from nexelem/feature/merge_upstream

Merge upstream version
Merge remote-tracking branch 'origin/develop' into feature/handle_double