Merge pull request #29 from trillek-team/develop

Develop
Merge remote-tracking branch 'upstream/master' into up_develop