Feat/issue #5

#5