Adding lib from master branch