wyc Merge pull request #1 from andbof/master …