bug fixes
Merge branch 'master' of github.com:nicolas-fricke/semmul2014