Change some require to require_relative.
Merge remote-tracking branch 'origin/master'