Merge branch 'isseu_18_akama'