small issue with boaicon fixed
merge conflicts