README update
Merge #3 and make some tweaks