Merge pull request #6 from aquilax/hotfix-comments

Addressed linter errors
Revert "Addressed linter errors"
Merge pull request #7 from aquilax/revert-6-hotfix-comments

Revert "Addressed linter errors"
Revert "Revert "Addressed linter errors""
Merge pull request #8 from aquilax/revert-7-revert-6-hotfix-comments

Revert "Revert "Addressed linter errors""
Merge branch 'master' into hotfix-comments