Checking in so it can be merged to master.
Updated readme to reflect single solution.