Squashed commit of the following:

commit de66b4ec5b87ba3a1158c120638b7272375d2b12
Author: Yuu ISHIKAWA <yuu.ishikawa@gmail.com>
Date:   Thu Apr 3 14:24:30 2014 +0900

    update files