Merge branch 'refactor'
added build to Makefile

- added bin/