Merge pull request #3 from manhole/play

2014/04/13までの分
Merge remote-tracking branch 'upstream/master' into play