Various upgrades
Get rid of infix notation
Setting version to 2.2.2
Setting version to 2.3.0-SNAPSHOT