Some fixes.
Merge pull request #5 from dragos/pr/795

Some fixes.