Fixed conflicts for pull request
Merge branch 'master' of github.com:plasm-language/pyplasm