Resolve last issues

It closes #88, it closes #89 and it closes #93