Merge pull request #291 from yinjimmy/merge_upgrade_to_2_2_3

bugfix