Bugfixes, add Readme and Makefile