Upgraded project to version 2.2.0. Fixed formatting. Fixed javadoc.