mergin with master to add external libraries