Cleaning everything up
Merge pull request #17 from mikedao/tying_it_together

Cleaning everything up