Merge pull request #5 from simurai/__mb__simurai__master

Header tweaks