Merge pull request #26 from steenpass/andreas

apply some major changes