Got rid of require_relative
Merged in master HEAD