[#40] Add a meerkat
[close #40] Merge branch 'meerkat' into master