First pull request 

first try of a pull request with changes from naehrlich