re 1.2.1
Merge pull request #617 from mirage/master

re 1.2.1