Getting dev branch up to date with readme master fixes