Merge branch 'develop'
Merge branch 'develop'
Update greatest.h testing library
Merge branch 'develop'
Increment version variable
Merge branch 'master' into develop