Fix #2 and fix #4 (Improve README)