Feat/issue 216

Solved #216 based on #229