Fixes and improves
Merge pull request #1 from KODerFunk/master

Fixes and improves