Fixed Issue #118. Cleaned up some code in other parts of Eva.
Merge pull request #119 from Cazra/master

Fixed issue 118