Fixed mock data bug
Merge branch 'master' of github.com:ybrikeeg/Mix