Feature/#42