Pretty much a stable version
fixed conflicts in README