Fix/#55 #56 modules

Fixes of #55, #56, related to modules