Made changes to be Flascc compatible during a Flascc test
Merge with master remote
Merge branch 'master' of github.com:nsteele/OOPC
Merge branch 'master' of github.com:nsteele/OOPC
Merge with origin
Fixed a problem that came about during merge