Order by in Balance form Fixes #174
Merge branch 'dev'