Added commons-lang3, and bug fix