Feat/issue 225

Solved #225 based on #226 

(3ab7b30)