Merge pull request #168 from MakozFriends/master

No more lints.