Feature/dynamic nodes merged into master