Merge pull request #22 from Minalien/master

Fixed metadata formatting issues.
Merge pull request #23 from Minalien/master

Merged changes from Neal's repository.