Adding more interactions to both modules
Merge pull request #21 from htakahashi/hiro

Adding more interactions to both modules