error handling
Merge branch 'development'