Moved these out of scrib.
Merge pull request #1 from cptmashek/master

Moved these out of scrib.