Added keyboard interrupt option