Update dev branch with correct README and fixes