Removed lib
Merge branch 'Erik'