Ready to send back to referees
Merge branch 'master' of github.com:patmorin/research