Merge pull request #18 from steenpass/andreas

apply corrections