Feature/master/add support for iprange

Closes #215
Closes #216