MICA 935 - FIX
MICA 936 - FIX
MICA 942 - FIX
Merge branch 'master' of https://github.com/Benbow/mica