Merge pull request #7 from mehlis/master

desvirt: quick findings