minor changes
minor changes
resolved some conflicts related to comments
Merge branch 'development'