Merged 0.2.3 changes
README update