Total library rewrite#3

arrowcircle wants to merge 2 commits intoclbustos:masterclbustos/integration:masterfrom

arrowcircle:masterarrowcircle/integration:masterCopy head branch name to clipboard