Merge pull request #6 from simurai/__mb__simurai__master

Fix class