Merge pull request #221 from reallyenglish/mitsuruy

checkout */hs-* from the master 52b6ecfa0d99b9ed0c118c295ede0a31210baccd