Rewrite the Rakefile according to the RSpec possibilities
Merge branch 'ifad' into develop