Adding metadata.
Fixed bug in set.
Merge branch 'test' into dev