more generic occurrences
Merge branch 'master' of ssh://github.com/XORwell/ice_t