trying to clear up trap errors
Merge branch 'develop'