Testing in place
Merge pull request #17 from LightGuard/master

Testing in place, ready to really start things up!