updated Makefile
Merge branch 'master' of github.com:jakobib/hshwd2014