improved variable verification
Merge branch 'develop'