added libraries
Merge branch 'master' into 9852608716137ec9d6e21ceb8c22706a760435a0