Merge pull request #4 from OlegGirko/master

Two changes necessary to build Mer for aarch64.