Closes #194.
rebased onto 6a0c84a84f9dba361361db0599e2699266684d7f
@darknao, @thunderbirdtr Is this PR relevant anymore?
Can you rebase your changes and resolve conflicts?
Pull-Request has been closed by thunderbirdtr
Closes #194.