fixed #6, fixed #7, updated README