Removed throwing NotImplementedException to get rid of compile error.
Merge pull request #474 from rizard/master

Last minute optimizations.