commmit before merging.
Merge remote-tracking branch 'origin/master'
Bug fix on initialization of System.