juergenhoetzel Merge pull request #334 from augustfengd/master