Merge pull request #8 from daviddavis/master

Cleaning up the code
Fixing bad regex for signal_data
Cleaning up code in a couple other places