Merge pull request #9 from dedeckeh/bugfixes