Merge pull request #7 from YATM/modularity

Fixed issue #3
Merge pull request #8 from YATM/master

Merge pull request #7 from YATM/modularity