Merge pull request #47 from fref/fix_pbm_move_gowap

Fix for #46
Merge remote-tracking branch 'canop/master'