Merge branch 'develop'
Forgot to add the static library files.
Merge branch 'master' into develop