merge to old version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Merge pull request #3 from kimkulling/Branch_d0b92834cece94141525ecc9bffa62f57b318803

merge to old version