NotImplementedError bug fix.
Merge pull request #1 from huseyinyilmaz/master

NotImplementedError bugfix