Many fix and tweaks taken from the other service I provide. Version went to the stable v0.1.0.