Merge pull request #56 from marwaneltoukhy/main

Makefile and README fixes