Merge library into master