New function was added.  Errors were fixed.
Merge branch 'master' with 'NewFunctionBranch'