Merge pull request #8 from dedeckeh/bugfixes