Github issue #187, #186
Merge remote-tracking branch 'origin/master'