issue #220 done.
Merge pull request #222 from darrudi/master

total.js issue #220 done.