Code

Merge branch 'rs/memmem'