Squashed commit of the following:

commit 53c22df8b9e62151a11fc9e06822a472a92a44e4
Author: aki-sakuma <mc.a.sakuma@gmail.com>
Date:   Thu May 29 09:09:57 2014 +0900

    squash