Merged upstream/master with local branch, added default option to switch