updated
Merge branch 'kan' of https://github.com/quangthi90/Gifu into kan
updated