Feature/#347