first part Mica959
FIX Mica959
FIX Mica968
FIX Mica968 v2
Merge pull request #30 from Benbow/master

Mica 968