Issue/#450

Added some flavour and sassy-ness!

Whilst doing this it also fixes #450