Updated code accordingly SensioLab test
Merge pull request #2 from picamator/dev

Updated code accordingly SensioLab test