Merge pull request #28 from pjakobsen/master

Registry management code
Merge pull request #29 from pjakobsen/master

Better reporting on registry files