first commit
Merge github.com:hburrows/cataloger
merging changes