bump.
Fixed specs.
Merge branch 'test' into dev