Merge pull request #1 from tomtomssi/develop

Develop
Merge pull request #2 from tomtomssi/develop

Development branch file
Merge remote-tracking branch 'origin/master' into develop