Merge pull request #263 from AnonnyX/master

Fixing Yara's removal and hoursSinceCum not resetting.
Fixes #218 and another bug
Minor change to fix 1f85ad8