Updated with skeleton for MacSoup.
Merge remote-tracking branch 'upstream/feature/mac_soup' into feature/mac_soup