Fixed hardcoded header paths
Merge branch 'ruby_2_1'