erged with AJ's changes
Merge branch 'master' of https://github.com/tannner/RubyC4