Updated according to @chinoogawa's commit on May 29 2014