Merge pull request #1 from highlyunavailable/develop

Develop
Merge branch 'master' into develop
Remove lint