Merge pull request #1 from rails-to-cosmos/master

pull #1