Added a simple Make handler; more comments in the code