final changes
Merge branch 'master' of https://github.com/asaluja/compositional-semantics