Update #432 by Henry: Clean up the master branch