Commit before refactoring
finished:  "operands of invalid type to operators"
Merge remote-tracking branch 'origin/master'