Merge pull request #35 from MichalPaszkiewicz/master

Master