Mix10 bug fixes, updated Main file
Merge branch 'develop' of https://github.com/Sable/mclab into develop