Version 1.0
Commit from master
Merge remote-tracking branch 'CaAnes/master'