Merge pull request #8 from geNAZt/master

Some neat Caching, Networking and API-Improvements.
Fix (typos|changes) made by geNAZt.
Fix (typos|changes) made by geNAZt.
Merge pull request #1 from Scrayos/master

Merge upstream changes