Minor cleanup, added mask option for binary image