Merge pull request #9 from Nokia-Developer-Community-Projects/master

Merge pull request #8 from yan-verdavaine/master