Merge pull request #120 from LuizArmesto/master

Conflict with Backbone 0.9.10