unit test added
Merge branch 'fragile' of https://github.com/Sable/mclab into fragile
Merge branch 'fragile' into develop