Merge pull request #139 from stef145g/develop

Sync Develop to Master for selected files