Merge pull request #7 from YATM/modularity

Fixed issue #3