Merge pull request #78 from cheese/master

two test plan fixes and ARM build fixes