removed references to Number due to compiler bug, changed functions slightly
Merge remote-tracking branch 'origin/develop-MW' into develop-JK