Hinsen pr7

Merge 'hinsen_pr7', adding module feature.