merged feature/library-project-refactor into development