Bugfix/7 fixed move

David Nicholsrequested to merge
bugfix/7_fixed_move into master

Merge request reports