fixed #716 and fixed #751
Merge branch 'master' of github.com:mbeddr/mbeddr.core