Getting specs working
Merge remote-tracking branch 'lastobelus/master'