[#39] Keep an aligator
[close #39] Merge branch 'aligator' into master