Changed option switches slightly for robustness
Merge branch 'master' into rpi