slight change to fitler
0 != forever
Merge pull request #628 from Tendrid/develop

Develop