merged
Merge branch 'master' of ssh://git@github.com/ovido/BPView.git