Adding fixes for use without SVN.
Preparing for release