Added start up commands,
Updated makefile
Merge branch 'master' of https://github.com/valvy/Aaf