Fix for compatibility issue
Merge pull request #140 from feryaz/dev-test

Fix for compatibility issue