[#23] Add elephant
[close #23] Merge branch 'elephant' into master