Updated as advised by @Ocramius