Tried to enchance the toggle name regex to be a little more fogiving aro...

...und dashes and underscores

This is worth having a loot at, but I will not be annoyed if it isn't merged ;) I have tried to make the regex a little better around the toggle name

This will help out #83