slightly cleanup the code
don't use old syntax for metadata specification
Merge remote-tracking branch 'alexott/master'