Repairing bugs
Merge pull request #1 from mjura/release/pebbles/pending

Repairing bugs