Update macros
Bump version to 5.1.0