fixed a problem where an expression was reduced into a statement resulting in a wrong context
Merge branch 'master' of github.com:mbeddr/mbeddr.core