(master) Added some changes back that got dropped during README merge