Switching to allman programming style

- updated to version 2.2.1
    - (compiling with 1.6.4-R0.1-SNAPSHOT)