System Editor Fix

v1.0
Merge pull request #13 from trialq/master

System Editor Fix