added 'waterfall(..)' contrib, closed #15