Partial merge (core files only) with original repo, commit 53a3731ff62a487fef93cbd8292ce85a08c82703.
Merge pull request #2 from cuanoo/upstream-merge

Upstream merge