Changes from @joshuawilson, @edewit, @sebastienblanc to be merged together and its location marked in the INSTRUCTIONS.
Changes from @joshuawilson, @edewit, @sebastienblanc to be merged together and its location marked in the INSTRUCTIONS.