Merge pull request #37 from steenpass/andreas

update part 1