added readkey
Merge conflicts