resolved #4
Merge branch 'feature/4' into feature/1