finally got my build working
merged changes with kevin
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
merged with james changes