Rename some vars. Replace short tags
Rename some vars. Replace short tags
Merge pull request #4 from atukai/master

Rename some vars. Replace short tags