incorporated Armins pull request