Error correction and system desing support

Refactoring fix
Merge branch 'master' of github.com:doofmars/Any-Beam