Merge branch 'master' into travis
Add spec.
Merge branch 'travis'