public
Merge branch 'master' of https://github.com/hhatto/go-otama

Conflicts:
	otama.go