Minor fixes
Merge pull request #70 from izaid/cuvar

Minor fixes