Updated readme, preparing to merge changes