Minor changes and new move operator