Added make file
Merge branch 'development' into release