Fix #6
Fix Module Settings