Bugfixes
Merge pull request #16 from warszawajug/staging

Bugfixes