Feature/custom i rt

A new pull request based on #2