Merge pull request #13 from dedeckeh/bugfixes