Fix issue #1 and update README