error handling
Merge develop into master