Merge pull request #2 from RoseTeam/Propulsion

Test merging between branch