Merge branch 'master' of https://github.com/SeverinP/Libium
Merge branch 'origin/Develop'