fixed up double vision
Merge remote-tracking branch 'holly/master'