small changes
Merge branch 'development' of https://github.com/jp-ganis/JPS into development