ADDED count check
Merge pull request #9 from SoSocio/ResponseBugFix

ADDED count check