Merge pull request #268 from htlxyz/upgrade_to_2_2_3

update