Merge in changes from PizzaBrandon/coverflow/master