fixed #859
fixed #853
Merge branch 'master' of github.com:mbeddr/mbeddr.core