Reduce ruby warnings
Merge branch 'reduce-warnings'