error checking
Merge branch 'development'