Task #125: Fixed multiple field function.
Merge branch '125' into test