incorporating containsKey from nitro2client
test moved from nitro2client
Merge pull request #5 from iplayer/incorporating-from-nitro2client

Incorporating from nitro2client