Issue #6, #9
Merge remote-tracking branch 'origin/master'