Issue #16, 17, 19.
Merge remote-tracking branch 'origin/master'