Merge pull request #12 from LabFimoTeam/master

Update Develop
Merge pull request #13 from LabFimoTeam/Develop

Merge pull request #12 from LabFimoTeam/master