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