Rangement *lib*
Merge origin/master