minor issue with empty module content
Merge remote-tracking branch 'origin/master'