Merge pull request #58 from pettai/heimdal-1-5-branch