Merge pull request #82 from ziggimon/master

Fixing up so x19 arm builds work.