Merge pull request #127 from Soundnode/develop

General fixes and issues related to PR #124 and #125. Also adds code refactoring
fixes #129 #119 and add code refactoring