Merge pull request #67 from dedeckeh/bugfixes