Merge pull request #14 from Benbow/feature/mica-fixes

Mica-935, Mica-936, Mica-942 and Mica-941