Adapted Makefile and added some notes on branching.