many fixes
Merge branch 'develop' of github.com:ActivityRez/ar-framework into chris-fixes
Merge pull request #156 from ActivityRez/chris-fixes

Chris fixes