Add fromMaybe. Add Makefile