Added backward compatibility till 1.4+; Fixes issue #17