Merge pull request #210 from ihptru/master

sync