added some breaks (code style)
Merge branch 'beta' of https://github.com/pcmdgit/JPS into beta