Incorporate Pierre's changes 2014-06-02