bugfix in master branch
Resolved merge conflicts
second release