merge master changes in issue 26