kbsingh Merge pull request #2 from kbsingh/kb-pr-2