Manually Added PR #30 & PR #31
Merge remote-tracking branch 'upstream/master'