Merge pull request #1 from dieterdemeyer/master

FIrst implementation