merge development branch

Unnecessary newline