Merge jvskelton/develop including attributes and version bump :/