Simplified mapping update check and made it more reliable.

Closes #46.
Used the first method I mentioned in #46.