Fixes and metadata.
Merge pull request #3 from RReverser/master

Fixes and metadata.