Fixes #7
Merge branch 'devel' of github.com:ska-sa/pyxis into devel