Merge branch 'LocalBranch'
Merge branch 'master' of https://github.com/tm1990/CircuitMod