Update in #18. Build on both 2.10.4 and 2.11.1