Update
Update + merge fix
Merge branch 'master' of https://github.com/cdrwolfe/phantomx_arm