Added Weight
Merge branch 'feature/15'