Updating system
Merge branch 'master' of https://github.com/faroncoder/faron-scriptor

This is updated changes that were made locally and merging to this git.