Merge branch 'master' into dev
Merge pull request #2 from droghio/dev

Resyncing branches