Finished first version of 'makefile'.
Merged branch with 'master'.