Merged diet branch

From:
User: