improved build process
library updates
merged master
merged master