Merge pull request #19 from dedeckeh/bugfixes