Merge pull request #18 from dedeckeh/bugfixes