first commit copy of original
Merge branch 'master' of https://github.com/chriserikbarnes/Oscar3-a5