Closes #13
Merge branch 'develop'
fix auto added carriage returns
set future version