Hackberry initial support
Merge branch 'master' of https://github.com/EddyBeaupre/armStrap

Merging with xps repository