merge

Merging to new changes made by Nic.