Version bump
Added options for  and