Better polish
Merge pull request #22 from Albert221/master

Better polish