Merged Justin's fixed into master