Merge branch 'develop' of https://github.com/nxkit/nxkit into develop