Merge pull request #1 from Bigjoos/master

Update to latest
Merge pull request #2 from Bigjoos/master

Updates
Merge pull request #9 from Krypto/master

Merge pull request #1 from Bigjoos/master