#4 Using commons-lang3 + reformating of some files
#5 Patch actions