Develop

@zyniq82 have a look.
I like the `spec` / `spec` switch though :smirk: