Changes in Bill + adding physical param
team updated
Merge branch 'master' of https://github.com/dirttech/Energy