merged marks changes with ruan's revisions
Merge branch 'singly' of https://github.com/logicmason/mosaiq into singly