Merge pull request #4 from atukai/master

Rename some vars. Replace short tags
files should not be executable -- started at: df11111a6e3b0d04a8bb303a663576a527f822bc
Merge pull request #5 from nclundsten/hotfix/executable

files should not be executable -- started at: df11111a6e3b0d04a8bb303a663576a527f822bc