Merge pull request #23 from dedeckeh/bugfixes