Merge pull request #33 from steenpass/andreas

revise part 1