Allow for blanks at the end of the line
Merge branch 'develop'