Adding Garret's changes.
Merge branch 'goldani-master'