test input from #43
split changelog to separate file
Merge branch 'upstream/master'