Merge pull request #29 from steenpass/andreas

apply some last changes