Multi moduleness fixed
Merge pull request #1 from cankill/master

Multi moduleness fixed