fix bug
don't trim dots. better?
Merge pull request #1 from notcome/master

update From original repo