Added handling for unmapped properties (causing NRE); added support for mapping collections
Merge branch 'master' of https://github.com/AaronTorgerson/HyperMap