resolved noticesand error
Merge branch 'develop' into testing