applying pull requests from iosolinf