Feature/issue 432

#432