Fixes for openmul issue #1, #2
Merge branch 'master' of github.com:openmul/openmul