Merge pull request #21 from greenTara/master

Fixing a number of issues
Added missing fail() call if umatching includes were found
Merge pull request #22 from greenTara/master

changing to a key that is successive integers rather than a hashcode
Merge pull request #15 from ag-csw/master

pull