Merge pull request #17 from steenpass/andreas

update to the first draft which was discussed with others