Closes #42: Compatible with 2.2