Fixed Issue331 errors
MIFOSX-331: merge in Kushas work for 1.2.0 release and fix merge conflict.