Merged dev to lib