CF9 compatibility
Merge pull request #6 from aliaspooryorik/develop

CF9 compatibility