Added backward compatibility with v2.5
Merge pull request #191 from rafalsliwinski/issue-180

Added backward compatibility with v2.5