issue#6 Fixing fixing merge bugs by David, Jonny