modified plotting
Merge branch 'develop' of git@github.com:XIA-Project/xia-core into develop