Some Rubies don't like this
Merge branch 'master' into layer_comps
Update README with layer comp info