Added support for Option to Macros

The encode and decode macros now support the Option type.