vreen update
Merge pull request #200 from gorthauer/master

Some fixes