Fixed measurement and bug with sorting
Merge branch 'master' of https://github.com/4thsource/modernmeal