Merge pull request #32 from steenpass/andreas

revise part 1