Changed ReturnCountExtended to use RegExp
Fix for warnings
Merge pull request #109 from KTannenberg/master

Changed ReturnCountExtended to use RegExp