~ Fixing basic things
+ better performance
Merge pull request #2 from Blockhaus2000/Blockhaus2000

Perpare for work :)