Merge pull request #16 from nbi-opendata/feature/refactoring

merge branch feature/refactoring into develop