Initial version of module
fixed merge conflict