Updated motion class fixes #41