Merge pull request #15 from LabFimoTeam/Stg

Merge pull request #14 from LabFimoTeam/master
Merge pull request #16 from LabFimoTeam/master

Merge pull request #15 from LabFimoTeam/Stg