working on #764
Merge branch 'master' of github.com:mbeddr/mbeddr.core
fixed #764