Added some options
Merge branch 'master' of http://github.com/tehalexf/res-ex