Merge remote-tracking branch 'joegallo/master'
update changelog