Updated specs to make the make them a little bit more idiomatic.
Merge branch 'master' into gh-pages
released version with better specs.