Merged in jollytoad/autoplan (pull request #1)
I've used a simple non-word character regex ("[\W]") in place of just "-"
I've used a simple non-word character regex ("[\W]") in place of just "-"