#31 Options Mask added