[CHANGE] lib returns instead of direct print;
Merge branch 'develop'