Merge pull request #27 from steenpass/andreas

apply some technical adjustments