CQLB 2

CQLB 2
Merge branch 'develop' of https://github.com/tramhao/weasel into develop