updated readme to reflect master merge