Merge pull request #7 from dedeckeh/bugfixes