Linting merge
Version bump