Fix all errors.
Merge remote-tracking branch 'upstream/master'
Format code again + organize imports
Merge pull request #448 from alexbegt/master

Fix all errors + format code and Organize Imports.