issue #1, #2, #3, #5
Merge remote-tracking branch 'origin/master'