working when_any

Finixing Issue #2