Fixing specs in master
Merge pull request #487 from ognevsky/fixing-specs

Fixing specs in master