Merge pull request #34 from steenpass/andreas

revise part 2