Add adding
Fix arguments
Improve scripts
Atchoum
Merge remote-tracking branch 'origin/master' into travis-ci