Added simple punctuation support
Changed file name to something more well obvious