Merge pull request #54 from dedeckeh/bugfixes