Merge pull request #12 from levfurtado/devondegrazia

Fixes #8 fixes #11
Fixes #11
Merge branch 'master' of https://github.com/levfurtado/iMedia-iMT-101 into devondegrazia