bugfix
Merge branch 'master' of github.com:New-Village/xapp7