AFABC-49 Bug fixes
Merge pull request #4 from Edzelopez/ISOC

AFABC-49 Bug fixes