ksolo p1
final add toggle functionality
Merge branch 'master' into toggles

toggleability
Merge branch 'master' into toggles

merging with updated master
Merge pull request #104 from tararoys/toggles

Toggles