Merge pull request #6 from dedeckeh/bugfixes