Updated some modules
Merge pull request #5 from Daapii/master

Updated some modules