LINT review
Merge branch 'develop' of https://github.com/edinella/beat