Robert feature

Problem with codeship not testing properly fixed.