- added versuffix macro for easy future branching