Deduplicate strings
Gather more metadata
Apply metadata and clean up main method
Merge branch 'master' of git://git.code.sf.net/p/maciasl/code