adding some validation and such
Merge branch 'develop' of github.com:ActivityRez/ar-framework into develop