test
make tests work
Merge branch 'develop' into test

Conflicts:
	metadata.rb