Build failure fix
Build failure fix
Build failure fix
Adding support for modules
Merge pull request #282 from tmughal/master

Build failure fix