Merge pull request #33 from thatcoderguy/master

Merge changes.
Change system settings almost working
Merge pull request #88 from widagroup/master

 Change system settings almost working