Incorporate changes from 0.98 and 1.00 releases