Merge pull request #11 from biicode/master

Merge pull request #9 from biicode/revert-8-biicode_1.0