Merge pull request #1 from Vexatos/patch-3

Patch 3
Fixed a lot

SQUASH!
Merge pull request #97 from Vexatos/master

Fixes.