Merge pull request #19 from steenpass/andreas

final changes before submission