major fixes
further fixes
Merge branch 'master' of https://github.com/mbeddr/mbeddr.core