version bump
merge
added support for unique properties in the spec file