librarify CYP
Merge pull request #1 from larsrh/topic/librarify

librarify CYP