Refactored to handle punctuation
Merge pull request #6 from munaf/punctuation

Refactored to handle punctuation