Minor fixes.
Merge pull request #4 from nursix/evass

Minor fixes.