Merging from Colin and Given pull requests 2