Merge branch 'develop' into ticket_275
Merge branch 'develop' into ticket_275
ticket_275 disable name and separated lines options added.
ticket_275 missing testing file
Merge remote-tracking branch 'origin/ticket_275' into develop