Added 2.3 compatibility

Resolves #1