Erich feature

Please except my pull request.