simple Makefile
minor fix and found other interesting things
add test
Merge branch 'dev'