Fix issue #2 and updated readme