changed INT() etc to use __VA_ARGS__, added vignette example
merged