Adding pull requests 26 and 27