Partial fix to #195, added not implemented flag check
Merge pull request #241 from adrian17/master

Partial fix to #195, added not implemented flag check