changes suggested by client
Merge branch 'development'