changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from MaxZoosk/master

changes