Merge pull request #30 from dedeckeh/bugfixes