fixes and features
fixes and features
Merge branch 'master' of https://github.com/4thsource/modernmeal