Removed unused variables from info file and added update function
Merge branch 'development'
Updated make file to point to master branch