first version copies from development.
Merge pull request #1 from ralfreddin/master

first version copies from development.