merged pull request and some fixes at images