Merge #16 from BugFixWeilin