Added username comment
updated makefile
Merge remote branch 'origin/master'