Merge pull request #20 from steenpass/andreas

final changes before submission