merged pull requests and tagged version 1.2.6