Fix for Issue #24 - Update with composite keys
Version bump to 2.0.8