[#21] Add ostrich
[close #21] Merge branch 'ostrich' into master