After pleroy's review and discussion.
Merge pull request #97 from eggrobin/remove-dimensionless

Remove dimensionless
Merge branch 'master' into fix-assignment