Commiters update
Merge branch 'master' of github.com:samuelgarcia/neo-paper-2013