Added some assignments
Merge branch 'master' of ssh://github.com/Tessmore/gr_v4