Merge branch 'V2' of github.com:droffo/ruby-tools into V2