edithostactivity merge
edit
edit
Merge branch 'master' of https://github.com/mkoba/Tinasaurus
Merge branch 'master' of https://github.com/mkoba/Tinasaurus
editing works