Edited system class.
Merge remote-tracking branch 'origin/master' into Model-Branch