Merged Justin's fixed into master
Merged Justin's fixed into master