Merge pull request #2 from simurai/__mb__simurai__master

Refactor