Spec added
Merge branch 'refs/heads/master' into rspec
Updated specs with @jcm refactoring