changes for incorporating options in Mix10
Merge branch 'develop' of https://github.com/Sable/mclab into develop