Fixing version evaluation in makefile.
Releasing 0.2.1
Merge branch 'dev'