Fixed #82
Quick fix for #61
Bump version and add Makefile
Simplify directory structure