Merge pull request #3 from htakahashi/hiro

Hiro
Setting up testing for Module S
Merge branch 'refs/heads/master' into HIRO