Cleaned source code style
Added the feature of pspz2 (version 2). Ticket #1447