Minor update
Changed to switch statements where possible
Tweaked version number