Squashed commit of the following:

commit 996e80ff5b0eee69da5d0af2bffbf034b32faa6c
Merge: 740c698 081c6fc
Author: haksudol <haksudol@gmail.com>
Date:   Fri Jun 7 12:09:50 2013 +0900

    8
kk