Merge branch 'master' into develop
Merge branch 'master' into develop
updated attribute handling in constructors
changed to using require_once instead of require
Merge branch 'develop'