Merge pull request #31 from tarunbhardwaj/develop

Weight should be in Decimal
Revert "Weight should be in Decimal"
Merge pull request #32 from openlabs/revert-31-develop

Revert "Weight should be in Decimal"
Weight should be in Decimal