Added additional checks to move functions
Merge pull request #108 from tranek/develop

Added additional checks to move functions