Merge ISSUE #7 into Master

This merged Issue #7 related to adding feature modules into the master branch.