Fix Bug and improve README