Updated for recent changes
Updated readme