Merge pull request #7 from bspaans/master

small fixes
haproxy typo fix