Feature/iss8

### Union of the work done by @reyro