minor changes, adding 2015 macro