Fix bug in Makefile
Merge branch 'release/0.7' into develop