Changed metadata handling.
release 0.4.0