Updated version, Fixed two linting issues