null check
Merge branch 'develop' of github.com:bendisposto/prob2 into develop
Merge branch 'develop' of github.com:bendisposto/prob2 into develop
perspective support refactoring