Added divertBinding to handle macros and variables
Added haddock strings