Updated make file to match ding2tal
Merge branch 'develop'
Merge branch 'master' into development