Merge pull request #85 from kareefardi/makefile-squashed makefile, design views update and tag update