Merge pull request #48 from rhokbrisbane/feature_specs

Specs
Merge branch 'master' into specs