Merge pull request #1 from Nefelim4ag/master … 

Cleanups
latest commit ecac9ff9a5
@kai3341 authored