Merge pull request #31 from joerghoh/joerghoh-master

please merge joerghoh-master