Merge pull request #6 from srautiai/master

Add missing variables