More fixes
Merge pull request #1 from MichalPaszkiewicz/master

More fixes