Added log
+
Merge remote-tracking branch 'upstream/master'
upstream changes
Merge pull request #21 from Spetz1/master

Added log