replacing static
Merge branch 'maru_samu_fb' of https://github.com/synlestidae/RiverWatch into maru_samu_fb