Updated Makefile
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
demos: Correction of comment
demos: Correction of output text
Merge pull request #9 from AlanMarshall/master

demos: Correction of comment and output text