Beautifying

Signed-off-by: Algorithman <algorithman.chris@googlemail.com>
Merge branch 'master'