Revert "Merged patches from support/0.1.x"

Apparently the patches from 0.1.x screwed up the 0.2.x codebase, replacing the 0.2.x code with the 0.1.x code...

Signed-off-by: BrotherEdison <brotheredison@outlook.com> (reverted from commit 3704156a97299d8ce114a65e5bd55ff6fd0908da)
Signed-off-by: BrotherEdison <brotheredison@outlook.com>