Added static lib & updated makefiles