Almost ready for master commit, edit README