trying to merge again
adding bug fix version corrected for merging