Merge pull request #508 from Bowman74/v.1.2.1

#348, Initial changes for unified API.  32 bit iOS library renamed to Xa...