Added Yawp's annotations.
Merge pull request #1 from pilgrimagesoftware/master

Yawp annotations