Added files that accidentally got deleted during merge.
Merge pull request #11 from lnewson/devel

Added files that accidentally got deleted during merge.