Balance calculation based on inputs
Balance calculation based on inputs
Get changes that were committed to master instead of develop.

Merge branch 'master' into develop