0.8.7.20 dev

Updated for 0.8.7 style changes