Updated README to reflect proper option switch names
Merge branch 'upstream'