Merge pull request #193 from stef145g/develop

Merge upstream/master to Develop branch