Merge pull request #186 from stef145g/develop

New merge of upstream/master to develop branch.