fixed a mixing @, refactored the t funciton to t, and removed the spaces from the curly braces for future update of curly
Merge pull request #1 from yurifrl/2-2-stable

few changes for future updates