Complete pending specs
Merge pull request #6 from devin-c/master

Complete pending specs