Refactoring and inline docs.  Version number change.