Merge pull request #49 from rhokbrisbane/specs

Specs
Merge branch 'master' into specs