Merge pull request #2 from dgcliff/develop

Fix for HashMap out of order bug raised by Rohan Mathure. VIVO-21