Merge pull request #15 from ADoby/Manu2

Manu Update
Small Changes
Merge remote-tracking branch 'origin/master' into Manu2