Feature/3

I haven't tested this since I don't have any example test cases. If you get chance to do it, let me know how it goes