Augustin: adding option and some stuff
Merge branch 'master' of https://github.com/Itaelle/AudioWire