Merge pull request #5 from gcv/master

Hi, Constantine, Thanks for your suggestion and codes!