Fixed some merge-related errors.
Merge pull request #1 from ayonix/mrcustomizer_reconnect-merge

Fixed some merge-related errors.