Another undefined variable error corrected
Merge branch 'dev'