fixes #129 #119 and add code refactoring
Merge pull request #130 from Soundnode/develop

fixes #129 #119 and add code refactoring