trailing whitespace
gather feedback the right way
Merge branch 'development'