adding modules
Merge pull request #11 from wylie/develop

adding modules