[#47] Keep a warthog
[close #47] Merge branch 'warthog' into master