Refactoring, set version from 2.1.0 to 2.2.0, refs #2 #3

Now all PN....'s should be removed.
Hopefully last PR today ;)