Add basic usage instructions
Merge branch 'master' into feature/switches