Merge pull request #507 from BKPepe/circle_ci