renew
Merge branch 'master' into refactoring/kagome2

Conflicts:
	README.md
Merge branch 'refactoring/kagome2'