cleaning up after adding bug-fix branch
clean up after adding development branch
first bug-fix merge
updated changelog