0xAozora

I did you the honor. > There are also parts that touch unrelated parts of the codebase; please submit a separate PR for those Any idea how to outsource part...

#37