Fixes Specs.

Fixes #74
Fixes #73
Fixes #58
Merge pull request #74 from JDutil/fix-specs

Fixes Specs