wip
Merge pull request #1 from konifar/fix/refactor

wip