Merge pull request #13 from johntanner/master

Changed file names.