Fix up all the files.
Merge pull request #22 from chadouming/master

Pull fix.