Merge pull request #12 from steenpass/andreas

fix minor issues and break up long lines