Feature/#369 #370