v0.03

Modify code to read switches