#86
#84 #116 cup & smoothie
Merge branch 'cup'