20140107 - 22:25

Added module/submodule support