Added missing libraries to make file.
Merge branch 'develop'