Removed -pg flag from makefile.
Merge branch 'dev'
Updated version number.