updated docs; new version
fixed merge