Module: Fixed weight property
Merge pull request #2 from cbodin/dev

Dev
Merge pull request #3 from cbodin/master

Sort out diffs