Closes #200
rebased onto 87613b4d12d2d076a4b754a73bcbf6fcb617b43d
@darknao, @thunderbirdtr Is this PR relevant anymore?
@d-enow Can you rebase your branch and fix all conflicts?
Metadata Update from @darknao: - Request assigned
Metadata Update from @thunderbirdtr: - Request assigned
Manually merged with 790e40d
Pull-Request has been closed by darknao
Closes #200