Put previous commit changes into effect.
Fixed indenting.
Merge remote-tracking branch 'upstream/master' into syb0rg-master
Merge pull request #1 from syb0rg/syb0rg-master

Merge
Merge pull request #7 from syb0rg/master

Put changes into effect from last commit.