5outh Merge pull request #99 from frontrowed/benjamin/circleci-2 …