ticket #1
Add make file
Merge branch '#1'