ExpressionEngine 2.6 compatibility. Closes #3