cleanup
Merge pull request #33 from BretFisher/master

fixed some files, hope you like it.