Added array checking to swing and option requests
Merge branch '93_option' into 202_prev_swing