Merge pull request #14 from dedeckeh/bugfixes