Added Andre's work to the master branch