switch to new variables @ format
Merge pull request #4 from sgrimee/patch-1

switch to new variables @ format