Ron's 1.0.x

Let me know if there's anything I need to fix/undo.