Merge pull request #12 from IcaliaLabs/master

Merge dev to master
Merge pull request #13 from IcaliaLabs/dev

Merge pull request #12 from IcaliaLabs/master