Merge pull request #3 from quemb/develop

Switch Disabled