Merge pull request #40 from dedeckeh/bugfixes