merged, fixed readme, fixed while loop