removed 'at' symbol from variable names
Merge branch 'master' into Issue31
Merge branch 'master' into issue_35