Moving these where they should be
Merge pull request #2 from gregoryklein/master

Moving these where they should be