I have updated source to include my changes merged with 0.9.0 changes.