Merge pull request #68 from dedeckeh/bugfixes