Issue #14, issue #31.
Merge remote-tracking branch 'origin/master'