add specs for previous commit
Merge branch 'bhouse-master'