Fixing specs
Fixing specs
Merge remote-tracking branch 'upstream/master'