various bug fixes
Merge branch 'master' of github.com:mbeddr/mbeddr.core
various bug fixes
Merge remote-tracking branch 'origin/master'