add bikkuri
Merge branch 'master' into hotfix/1.0.1

Conflicts:
	README.md